removed optional resolution and made cql dependency optional