Updated for Cube attributes, etc.