Updated documentation, test and enhancements