Fixed API problems for System and SystemManager