Removed some unnecessary configurations and added additional options