Added override methods