Added Loading animation + factory