Added stubs for addtional features