added semantic parser, query composer