Little addons on TODO