Removed Class call for now.