Added api and core