Added support for standalone usage