Update to be compatible with the latest changes on AGSEC