Further implementation of API to handle Target API
Merge remote-tracking branch 'origin/master'