Switched to using own classes.