API for adding scheme and few changes