Improved annotations and added some new features