Removed usage of check module
Added ap identifier to returned message under 'ap' field