Adding basic evaluation framework