Fixed #33 - Implement new API for Plugins