Changed plugin methods signatures and adaptoed changes in other plugin implmentations.