Added ViewOptionsTrait and updated relevant mappers to use it