Changed constructor and method signature