Moved more API calls
Schema pattern matching is now more strict