Breaking properties out to make modification easier