Changed to object structure