Updated api
PSR2 fixes