Fix: Access restrictions added for handling MTs