modifications to adapt to api conventions