changed pereferenceKeys from strings to enums
Merge branch 'sound'