More changes and added new files for efp