Created constants to avoid hard coding in DTOs
Updated DTO setter/getters calls