Bug fix and new utils