Minor changes to handler class