Raptor

This enables Raptor compatibility, see commits.