Fix #36 anhanced backend functionalities