Documentation, imporved data_controller