Updated main application files