Updated some fancy things for API