use simple structure instead old complex usage