Entity input handling changed