improved creators, reads from files, rename methods to entity