Add Plugin support using annotations