Seperated objects and entity - added rendering context