Plugin and API improvements