fix API using the new thin object model