Added helper logic to views