fixed problem with brunch length
improved data model structure