Made changes to db and properties method(s)