Added OptionsHolder class, changePassword class