changed class
changed handler keys