Fixed missing features