Add optional angular parts and more options in general