Deprecating a few classes + add a new indicator class