Refactored Model, added String constants