Added prop adapters