IDE-1132

Eliminiate use of @DependsOn as the the suggestion of Sapphire and add
necessary listeners to replace the functionality of @DependsOn.