Modify properties to be more generics.