Feature/generic app