Allow gallery to be undefined
Fixed knox bug
Added support as cco