migrated conf to new pojo setup; easier to maintain