Some updates fixing classes