Trying to make things a bit easier for client.