Skip empty methods and add hash support