Work better with existing omaps