Added decorators + improvements on validators js