Added base angular functionality