Plugin Plugin annotation refactor

Removed usage of deprecated "expression" annotation in favour of using the new "property" or parameter with default-value where applicable.