Change property types to simplify processes