Make sure all objects are in an array, helps with import

Signed-off-by: Yuri Tomanek <yuri@tomanek.com.au>