Added arguments to initialize