Updated EFKs

Tagged and made some changes as requested by Product.