Updated controllers with new data paths