Replaced all referneces to selector with a reference to alias