Final API structure, added fragment identification