Add not empty fields checking