Data structures efficiency - added