Add more description, use collections instead of arrays