Removed start() and end() from handler