Cleanup, added ::as and ::asContainer