Reintroduce conditional dependencies