Improvements in efl_common.cf