ML: Query support added