#5 Added types for objects