More implementation for AMEC-2262