Modify logic based on Core API spec