Refactored from Xtion namespace