RMA: Stored procedure & DB model updated to reflect latest schema modifications