Changed validations system to strategy (not finished yet)