Added basic status check