Move to more object-orientated manner
Bump version