Added handle animation, listeners and some other things