Moved to another layer of indirection for installation