Further features implementation