Implement API changes
Merge branch 'master' of https://github.com/TridentSDK/Trident