Use dependency table as arbitrary class fallback

Use dependency table as arbitrary class fallback #4648