Added compatibility with GUI