Added helpers and user model