Added Features and Listeners