Adding exception classes and Institution editor