changes to Kraftwerk core class