Added Position column and entity