Add Object, icon
Cleanup