API Modififcation for Separation of concern