[CODE ANALYSIS] - return empty collections instead of null.