updated data model and managers
add new Data Filter system