Completed functionality for support plugin