Adding support for multiple attributes for a move