Add Query builders for environments + Move API version in config