Fixed segfault
Interface enhancements