This whole class is marked as deprecated, are we sure we should be adding things to it?