Fix BCJ signature
Add output structure