Updated to changes from EJS