Improve extensibility fix #1