Added @Array
Added @Object
Added more tests