Raj - Moved more functions into the main plugin class