added custom settings values and updated models