Implement suggested changes and add ForwardSubsumption to CLI