More methods and some enhancements