Added Expando capabilities