Before Images controller refactoring