Feature/scanning