Added ( yet unstable ) standalone support