Applied required changes for Armory