Fixed some interface arguments. Started to add properties