[SDK-41]: Fixed bugs. Adding documentation later.