Fixed issues with adapter module