More work on CF deployment system spec