Moving static to make Angular easier