Add new version, scheduler + multi mount support