Change constants over to properties