Adding deprecation comments per @peterbe's suggestion