Removed dependance on a non-core class