Minimize scope for a first version