Improved features and validation