Updated gems & introduced user model