Added Line and Bucket

Fixed the method signatures to all match c++ format