Feature/enhancements