Added object validation