[TASK] Allow scaling for better use in scalable apps