added basic implementation for infrastructure classes