Add changes from Grafinia