Got rid of halfbaked rawselector
Added Element type