Changing addSystem method