More goodies, updating object types, more options etc