diff -r 9af5b2f49cb0 -r 0d7b63408a1e javaquery/demo-twitter/src/main/java/org/apidesign/bck2brwsr/demo/twitter/TwitterClient.java
--- a/javaquery/demo-twitter/src/main/java/org/apidesign/bck2brwsr/demo/twitter/TwitterClient.java	Fri Apr 26 13:51:15 2013 +0200
+++ b/javaquery/demo-twitter/src/main/java/org/apidesign/bck2brwsr/demo/twitter/TwitterClient.java	Mon Apr 29 13:56:16 2013 +0200
@@ -19,19 +19,16 @@
 
 import java.util.Arrays;
 import java.util.List;
-import net.java.html.json.ComputedProperty;
-import net.java.html.json.Context;
-import net.java.html.json.Function;
-import net.java.html.json.Model;
-import net.java.html.json.OnPropertyChange;
-import net.java.html.json.OnReceive;
-import net.java.html.json.Property;
+import org.apidesign.bck2brwsr.htmlpage.api.*;
+import org.apidesign.bck2brwsr.htmlpage.api.Page;
+import org.apidesign.bck2brwsr.htmlpage.api.Property;
+import org.apidesign.bck2brwsr.htmlpage.api.ComputedProperty;
 
 /** Controller class for access to Twitter.
  * 
  * @author Jaroslav Tulach
  */
-@Model(className="TwitterModel", properties={
+@Page(xhtml="index.html", className="TwitterModel", properties={
     @Property(name="savedLists", type=Tweeters.class, array = true),
     @Property(name="activeTweetersName", type=String.class),
     @Property(name="activeTweeters", type=String.class, array = true),
@@ -109,9 +106,8 @@
         model.queryTweets("http://search.twitter.com", sb.toString());
     }
     
-    private static final Context DEFAULT = Context.findDefault(TwitterClient.class);
     static {
-        final TwitterModel model = new TwitterModel(DEFAULT);
+        final TwitterModel model = new TwitterModel();
         final List<Tweeters> svdLst = model.getSavedLists();
         svdLst.add(newTweeters("API Design", "JaroslavTulach"));
         svdLst.add(newTweeters("Celebrities", "JohnCleese", "MCHammer", "StephenFry", "algore", "StevenSanderson"));
@@ -147,19 +143,19 @@
             !activeTweeters.contains(userNameToAdd);
     }
     
-    @Function
+    @OnFunction
     static void deleteList(TwitterModel model) {
         final List<Tweeters> sl = model.getSavedLists();
         sl.remove(findByName(sl, model.getActiveTweetersName()));
         if (sl.isEmpty()) {
-            final Tweeters t = new Tweeters(DEFAULT);
+            final Tweeters t = new Tweeters();
             t.setName("New");
             sl.add(t);
         }
         model.setActiveTweetersName(sl.get(0).getName());
     }
     
-    @Function
+    @OnFunction
     static void saveChanges(TwitterModel model) {
         Tweeters t = findByName(model.getSavedLists(), model.getActiveTweetersName());
         int indx = model.getSavedLists().indexOf(t);
@@ -170,12 +166,12 @@
         }
     }
     
-    @Function
+    @OnFunction
     static void addUser(TwitterModel model) {
         String n = model.getUserNameToAdd();
         model.getActiveTweeters().add(n);
     }
-    @Function
+    @OnFunction
     static void removeUser(String data, TwitterModel model) {
         model.getActiveTweeters().remove(data);
     }
@@ -186,11 +182,11 @@
                 return l;
             }
         }
-        return list.isEmpty() ? new Tweeters(DEFAULT) : list.get(0);
+        return list.isEmpty() ? new Tweeters() : list.get(0);
     }
     
     private static Tweeters newTweeters(String listName, String... userNames) {
-        Tweeters t = new Tweeters(DEFAULT);
+        Tweeters t = new Tweeters();
         t.setName(listName);
         t.getUserNames().addAll(Arrays.asList(userNames));
         return t;