Moved tenant methods to tenant extensions and marked old ones as obsolete