Add self type to syntax