Removed dependancy on classes.