core: data validation improvement