Use table for object list

Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>