Final changes in plugin v 1.1