Added support for configs and serialization