OOF API changes to add fixed and special treatments