Fixed plugin system and added sample