merged fully with dpki package