Added underscored prop support