Changes to help scalability of TOPS layer.