change api to BDD style