Added aspect proxy class for managing eoc