Account services optimization

shape