Adding fully labeled dataset support