Expanded the Android framework and added primitive types to the DSL.