Added methods to decoder and misc. stuff