* Added camera and entity handler