Included some @todo's suggesting the assessment of some methods used to find an object inside a List in order to reduce search time. One option is to change some List objects by a HashMap. Other details can be seen at the @todo's inside the source code.