Current system is fine as it is, we've been doing it for years like this.
No need to make it more complicated.