added basic system support