Change last visit aproach. Update controllers structure