TC-449 Add Calabash entities