Added basic api checking