Moved elation helpers to separate script
Added more helpers