Added untyped and generic versions