Moved from angular to AMD