Add implementation,minor fix in index