fix: used arrays instead of objects