Updated utils library