Added surpport for standalone usage