common changes to unify apis