Add version number
Optimizations