PoC5 updates, and added decorator paradigm