Modified for initial POS infrastructure