Minimal improvement of the getters
Optimized get_data