QAART-453: Addressed Sonar's major issue that decclarations should use collection interfaces rather than specific implementation