Change run function to add structural features