Improved self documentation