Revamped version, hibernate added for main POJO's