Changes for making Angular work!