Improve subscription check