Re-add support for lambda attribute values