Feature/separator