Started working on entities