Additional changes to strcuture