Added for OO