Object & Model changes + static implementation