Feature/mage spec update