More dependency support