Improve modules in core/lib/gaku