Added missing implementations in layer1