Added hanler controller