Basic armory parsing added