Added 'child' option + some minor changes