Added/removed properties to support our needs. REOL-32