Migrating legacy stuff to object model