Minor changes to improve extensibility

Should have no side effects