Some methods added, check TODO