Use proper package and tweak status check