Updated with recent changes to the primary LOCAS classes