Prepare to add angular support