Updated class name and constructor