Change models structure add validation and filtration