Added formValidator and userHistory modules