Formatting and organizing imports
Fixed 'unchecked call' compilation warnings
Refactoring
Refactoring
Refactoring
Support for @Embedded annotation