Simplied order class and decoupled classes