Changed back to individual unwrapped classes.