Moved checks to api