Adding query builder - ++Version 0.13.0