Moved additional logic into view state