Added currentId storage/retrieval in model