Added SELF keyword for moves