Fix Type class reference error
Fix child links