Build 0.3

Updated classes