move configuration to objects, fix syncing