Modified entity class for Usuario and added new entities