Add Enhancements and update Limitations