Issues #1 #2 : optional fields basis