Fixed class visibility issue