Added required modifications for Armory