Added support to run on CF