Added TODO [ci skip]
Updated composer.json to patch sources after an update
Fixed annotations