Added abstract warp container

Requires upstream merge.