Slightly change class definition passing