Made client code more readable