Added source
Removed code removed from 0.2.5 SDK