some utils and configuration added