Feature/data improvements