Removed handler class and simplified