Added basic config support