Add logging and missing feature handling