Improve Map Creation
Add gson library