Fixed models; Added Hibernate Search