Small changes for better extensibility