Issue #21 Moved Singleton outcome classes into Outcome fields