Some refactoring
Added processing of multible dimensions (for example elc with nodes)