added more Hibernate annotations and some getters and setters