Fixed for new structure.  Adding stub for cloudbox option