Moved OSMP to seperate class