Removed application reference to make it more generic