Added keychecks