Added W/A/S/D support