Added Data binding and Object Oriented Logic