MOBILE-155 New design for resources