Some Improvements for Future Releases