Continued work on entities