Added more system checks
More system checks and handlers