without empty fields and with more mapping directives