Additional updates for proper dependency generation