Add config and cleanup