Updated to support top data