Restructured some of the unimplemented methods.