Added new fields to beans
Formatted everything to programming practices