Version 1.0.1 compatible implementation done