Added conditional get and dependencies