Modified some interfaces