Added core functions & querybuilder update