data and role validation improvements