improved deployment and entities