Move from statics to Object oriented