add edoc and proper support