Added entity implementation