Major API Re-write, Improved extensibility