migrated updates from oniyi-utils