Updated for puma compatibility