add support for standalone operation