Added basic CREST support