Refactored Laredo class