Improvements and new utils library