Added basic object orientation