Add covariant return check