Updated 2.0 Compatibility