Added system check