Need major changes to configuration mechanism