Updated Enzebe class