Move to user.js format