Implement ability hander helpers and some fixes