Small change for better extensibility in the future