Begin to adopt to v2 spec