adding objectType
Merge branch 'new_website' into test_server_alt