Committing changes to the process & api

Enhanced robustness of the system api.