Add more specs to the bounded context feature, Refactor