Restructuring of several Terminal procedures