fill remaining definitions