Add workspace/collection fields