Updated API common classes