Preparing for more features for the standalone version