Reduced the number of methods