More stub completion