Added handle and constant dimensions (no magic numbers)