Changed constructor from package-private to public