Removed producer and moved qualifiers