Added some more options needed for EAK like behavior