Added import from common lib