Some additional functionality added