Added system endpoints