* Small changes to comply with new API