Seperated client. Added missing method feature.