Using properties for versions whenever possible
Merged