#74 Add required validation