Add Logs
Cleanup
Return empty array instead of null