Add support for simple case.