Reworked ninja support