Structure updated, APX added