Added untested android/java map an enum generators, TODO unit tests
Refined goals