Adding missing Classes