Made changes for devise