Some functionality added