Added enums instead of reference for behaviour/type