Changes made to according to AugurFramework requirements