Added optional angular modules