More class implementation