New object-oriented code added