Several improvements
Add generation of two further files