Properly implemented methods, removed stubbs