Add FileStorage, new built in goals