Output mappings, added coffee-redux