Added more fields and re-exported newest features