Improvements for easier usage