Adding missing stuff