Support more features and standalone deployment