Few changes and add-ons