Split types into seperate file for development