Feature/list objects eqc addition (squashed)