Switched to containment and removed stdlib dependency