Added keywords
Renamed handlers to match convention