Added missing features