Added more doc and features