Adding annotation and documentation