Changes to the code to remove AV dependencies: now handling specific cases (will throw in general cases, we can implement when needed)