Adding Calabash features