Added margin & type-hints