Unify object controllers