Updated the way compatability is handled.