Changes for using @Alternative mechanism