Implemented more Jade and collapsers