Maybe we shoudl abstract these into an %extend