Adding API first implementation