Add support for capture