Updated to include plugin directories