some enhancements to make to more suitable for our apis