Use more scalable approach