Modified construct class