Fixed Exception handling, added a many-to-many indicator category table