Rework entity attachment and character model