Importing and generalizing more code from Trauma