Added properties to spring mapping.
Cleared all redundant imports