Add containment and remove stdlib dependency