Fixed baseline implementation; added some acces methods to public
classes