Initial changes to upgrade to optiq 0.6