Added entity marking