Complete basic code

Update some code with New classes