FRBEV-2 - Added validation and fixed some bugs