[#BDKCORE-200] - Modified model to new requirements