Improve fields validation