optimized Data descriptor
renamed descriptor's arguments
optimized Query descriptor