Add layers of indirection for features