Modify build order to use object type adaptation