Major changes to Physics and Generic cases