Add config-based stuff