Added BddDbfindStories & refactoring