o.c.ams: Added new class