Updated object definitions to work with rendering.