Adding subscription check