Added BDD functionality