Fixed exceptions and added HasAid table