Decouple resources from entities and added @Column names