Structural and API improvements