Work in progress, different way to handle configuration