Improve Object handling