Prepare for Armory changes