Added some annotations for future development