Change alias_target to work with machine instances and stop adding class methods #27