Updated from source repo, maintained changed API