Refactoring so that Option issue in PropertyType will be solved