- Added performance TODO