feat: add hosts options, added some enhacements